<<<<<<< HEAD
<?php
header("Content-Type: text/html;charset=utf-8");
include_once './includes/auth.php';
include_once './includes/res.php';
include_once './includes/header.php';

require_once 'service/UserService.php';
$userService = new UserService();

$settings = $userService->getSettings();
// https://www.google.com/calendar/embed?src=ahlon2002%40gmail.com&ctz=Asia/Shanghai
?>
<div class="container">
    <iframe src="<?php echo $settings['calendar_url']?>" style="border: 0" width="100%" height="600" frameborder="0" scrolling="no"></iframe>
</div>
<?php 
include_once './includes/footer.php';
?>
=======
<?php
header("Content-Type: text/html;charset=utf-8");
include_once './includes/auth.php';
include_once './includes/res.php';
include_once './includes/header.php';

require_once 'service/UserService.php';
$userService = new UserService();

$settings = $userService->getSettings();
// https://www.google.com/calendar/embed?src=ahlon2002%40gmail.com&ctz=Asia/Shanghai
?>
<div class="container">
    <iframe src="<?php echo $settings['calendar_url']?>" style="border: 0" width="100%" height="600" frameborder="0" scrolling="no"></iframe>
</div>
<?php 
include_once './includes/footer.php';
?>
>>>>>>> 20d6c557d209a3f376420616f57b4bd953611975
